Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Tue, 4 Apr 2017 13:17:08 +0000 (09:17 -0400)
committerTom Rini <[email protected]>
Tue, 4 Apr 2017 13:17:08 +0000 (09:17 -0400)

Trivial merge